Merge branch 'master' into alt-registry-publish
authorChris Swindle <christopher.swindle@metaswitch.com>
Tue, 3 Oct 2017 10:32:29 +0000 (11:32 +0100)
committerChris Swindle <christopher.swindle@metaswitch.com>
Tue, 3 Oct 2017 10:32:29 +0000 (11:32 +0100)
commit4f089431591ca1afd678feddc6df400de6c4d93b
treec4c6c585f3e739bb03570c9ee3d7d896fb19b828
parent345c03d4cfbd34e2ccb1c634a21fa7f624452e7d
parent873a081019d8efb1906ae44c9afaffeec21f7db5
Merge branch 'master' into alt-registry-publish

Conflicts:
src/cargo/core/package.rs
src/cargo/core/package.rs